Merge "Fix stuck unlock animation state" into udc-d1-dev