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

Change-Id: I3c2fc4b161fc40c8e80d1ee2fd9f3e7668c2aef5