Merge "AOD: Only play wakeup animation when actually waking up" into oc-mr1-dev