Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev