Merge "Visual refinements for lockscreen." into lmp-preview-dev