Merge "AOD: Prevent animations and rotations while going to sleep" into oc-dr1-dev