Merge "AOD: Fix wakeup animation duration" into oc-dev