Merge "Revert "Add accessibility support for tooltips""