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

Change-Id: Ie7fb82c4def54620b2ca22714a7fa83a2afe515e