Merge "Fix a NPE in confirm lock screen."