Merge "Fix starting window did not transfer to starting activity." into...
Merge "Fix starting window did not transfer to starting activity." into rvc-dev am: 94be6df3 am: a2cba159 am: eb1fd893 am: 4225d38a
Change-Id: Ie7312859f2f48b84e1573db1fbf8c2f7299f6bc7