Merge "AOD: Update wakeup animation" into oc-dev