Merge "Fix broken tablet layout of QS on lockscreen" into lmp-preview-dev