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

Change-Id: I1a00df4be76dbf998eda020ad59c5ce38096857d