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

Change-Id: If293e615a3e7038668b3134f22694b576e809e55