Merge "Add test to call setInputWindows twice" into rvc-dev am: bd1a5621b6 am: 0c98ac19ae am: 2b7ae24df0

Change-Id: Ifc6d497a0791c37c8d1974a26a7a6cb153de235d