Merge "Apps tabs align to title on 2-pane settings." into jb-dev