Merge "Add setting to control tabs per app behavior" into jb-dev