Merge "Fix starting window did not transfer to starting activity." into rvc-dev