Merge "Fix LockIcon animation" into main