Merge "Use common xml file for multi-tab settings." into mnc-dev