Merge "Add test to call setInputWindows twice" into rvc-dev am: bd1a5621b6

Change-Id: I6b790fa07b34bb47af221d46734762c3eb03613a