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

Change-Id: If7a307c63ec86d3976c0950a96b112a7e1584edd