Merge "Avoid intermediate orientation change" into sc-dev