Merge "Improve "Try again in 1 seconds" behavior in lockscreen"