fix task kill button visibility
Merge branch 'master' into hs_staging