Merge "Re-commit: Add accessibility support for tooltips"