Merge "Fix to work statusbar configs as mcc/mnc" into mnc-dev