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

Change-Id: I9efeb5bdcf7d4d6cfd0070a2de69f0f73b54b4ad