Merge "AOD: Fix rotation during screen off (again)" into oc-dr1-dev