Merge "Fix blank lockscreen." into lmp-preview-dev