Merge "Restore unlock animation to its former speed." into main