Merge "Use rotation transition to handle display config change" into sc-v2-dev