Merge "Don't delay keyguard animations" into main