Merge "Merge "Ensure that all displays are updated upon any changes to rotation." into oc-dr1-dev am: adec8518af" into oc-mr1-dev
am: 988a6dd5e3

Change-Id: I12d0a463d4f397b213aa83e434e983689ecdd075