Merge "Fix 5125978: remove lockscreen logspew"