Merge "Made layout fixes to support 7" tablets" into jb-dev