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

Change-Id: I7dab6f187d36e86c419cf3da4fe504cb574b76c3