Merge "Initial changes for new 10inch layout." into jb-mr1-dev