am bc0c0dd5: am 3f7a8a1a: am c3ff2ab8: Merge "Use a common multi tab settings file" into mnc-dev

* commit 'bc0c0dd5e933fc4aab83240971e1efb6f9ef079f':
  Use a common multi tab settings file