Merge "Fix ActivityRecord leak if starting window was transferred." into sc-dev