Merge "Changed tablet tabs to be a drop down spinner" into jb-dev