Merge "Changed content description for add contact and group buttons" into jb-mr1.1-dev