Merge "Avoid entering display freeze mode when using seamless rotation." into nyc-mr1-dev am: 7184f8804f am: 872a5fbd5f
am: 3c0b58f486

Change-Id: I4d57ba9b513fa2849b9dc6ec015544546cd7e8eb