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

Change-Id: Iec2591a4dbea777d892de8d46f6835e988921a10