Merge "Fix 2332563: Add password-lock support to lockscreen"