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

* commit '6e5dd1d38dafa92d26fe83601e77a7962b8f3025':
  Use a common multi tab settings file