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

Change-Id: I0ed4eb1635d525d3e82bab7b26171cd0b40a37a6