Merge "Update window threshold in both directions" into rvc-dev