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

Change-Id: Ib11c09f53d9d020830045bb403241f70836541d0