Merge "Fix 6539117: Fix layout issues on 600dp device." into jb-dev