Merge "Fix Signal strength display issue in Settings." into mnc-dev