Revert "Revert "Revert "Fix 'Upload button tooltip doesn't disappear' #7461"""

This reverts commit 23f164fb039720a94ae82f89c296645dc1fbbd98.