Merge "Fix clipping on 3g icon" into oc-mr1-dev