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

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