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

Change-Id: I22507d607f033ec32d8f83aca312a156e2ce61fd