Merge "MSIM: Maintain backward compatibility for mobile settings"