Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64 am: c0eb6269c6

Change-Id: Ieb85555c9cbe4992c1e5f5a2c6a1438f3ad6b291