Merge "Reduce legacy lockscreen bottom area on small land screens - follow-up" into main