Merge "Fix 5027468: prevent screen from turning back on while lockscreen in password mode."