Merge "Fix 4691563: Don't show lock before unlock screen"