Merge "Fix quick contact icons accessibility issues"