Merge "Initial support for display rotation in shell transitions" into sc-dev