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 am: decf2e6a
Change-Id: I080a606bb450bd349770a5828ce4912dcf425967