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

Change-Id: Ic1d7779f66958961da22230187f71310d9fedec8