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

Change-Id: I137a818d432a69180087e2895daccc65e7a97daa