Merge "Always show appropriate mobile service label." into ics-mr1