Merge "Fix wake-and-unlock animation" into oc-dev