Merge "Reduce setInputWindows calls" into rvc-dev am: 75328289e2

Change-Id: I4740ed06c3264a105cfeba5f64166c7618543d68