Merge "Ensure unlock icon animates" into sc-v2-dev