Merge "Make Android Project view the default view for new projects"