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

This reverts commit 362a0d0e12f7fd3f121b67b4507be85475795f96.
Revert "Revert "Fix 'Upload button tooltip doesn't disappear' #7461""

This reverts commit f576b8e2694cdc90358ba99bc1d818fb7f18914a.