Merge "Add accessibility support for tooltips"