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