Merge "Adds the staggered ring unlock animation!" into tm-dev