Merge "Fix roaming icon when not default signal" into mnc-dev