Merge "Fix surface release race when using Shell Transitions" into sc-dev