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

Change-Id: I11ae95de8143b7e90badf4ac222af2a113df5234