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

Change-Id: I439598baf3cf601a771b257812d506561a98cc98