Merge "Adds the continuous unlock animation!" into sc-dev