[[ Bug 13401 ]] Reinstate button name as visible label when label set back to empty
Merge pull request #1154 from runrevali/bugfix-13401

[[ Bug 13401 ]] Reinstate button name as visible label when label set ba...