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