am 3bd37b14: am 8ef74990: (-s ours) am c3ff2ab8: Merge "Use a common multi tab settings file" into mnc-dev

* commit '3bd37b147e6adf634ce2117e2e97c45d468d40ba':