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

Change-Id: I904a49d3149f6388a4906a853eb507eda5af6abb