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