Merge "Use right starting window resource in multi-window mode." into nyc-dev...
Merge "Use right starting window resource in multi-window mode." into nyc-dev am: 3eefb4c3 am: a2ce89ce
am: 55ca92d9
* commit '55ca92d9':
Use right starting window resource in multi-window mode.
Change-Id: I4c0cf10fcfd19d4a2eff35f098496e1b330221fe