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

Change-Id: I078b15d3f723512e4b55829f5add7d804b2b7fc3