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

Change-Id: I0f1a54af22fece0a69801126faef97a905d18c41