Merge "Initial changes to support smaller landscape layouts." into jb-ub-now-jetsonic