Merge "Update SMS mirroring icon to new style." into oc-mr1-dev