Merge "Tweak hover for better accessibility and compatibility. Bug: 5087943"