do not display wait icon if not running
Merge remote-tracking branch 'upstream/master'