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

* commit '0a877a84bf5d4eb0d4baaafa76580d39b9a4c4ee':
  Use a common multi tab settings file