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

* commit '3f7a8a1a643a39163f22d164544ea9adbe16bd6a':
  Use a common multi tab settings file