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

Change-Id: Ib27f0373d92d6483a966532fd91bca556fbe08cf