Merge "Refresh screenlock UI after password verification failed" into nyc-mr1-dev