Merge "Avoid entering orientation changing state when seamlessly rotating." into oc-dr1-dev am: 17844f2257
am: 2c3fecd4de

Change-Id: I97d216587f3ba0225164e4c9457bddcde0e884ee