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

Change-Id: I853022e8ebfba9724d544beb795560757be7281c