Merge "Fix jank when launching an activity from an occluding activity." into sc-dev