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: 8fb4a020 am: a88b9d44 am: 9f8232c8
Change-Id: I2da648a6e94dd132ad52272b28983286f02ca9db