Merge "Fix hints for tablet lockscreen." into lmp-dev