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

* commit '8ef749906cc9276188705d23b6e68d9ed2789ec0':