Merge "Fix starting window did not transfer to starting activity." into rvc-dev am: 94be6df39d am: a2cba15913

Change-Id: I04b2b186e01f0d93c470f8ac6020ebf44270cffb