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

* commit 'b9b293119d3a4a94b5d05d8e555070738ca3c36f':
  Add setting to control tabs per app behavior