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: 843ca201 am: 1098dde9
Change-Id: Iba04e86fda86d398cb149a44bac382154f3eb55a