Merge "Allow finishing activity to transfer starting window" into rvc-dev