Merge "Cleaning up folders for 7-inch and 10-inch UIs" into jb-mr1-dev