Merge "Use opaque enter animation for freezing without rotation change" into sc-dev