Merge "AOD: Fix wakeup transition jank" into oc-dr1-dev