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

Change-Id: I85af20f828bec62d2c6f5e941a44bba359660a21