@markdj,
This issue has been fixed for past few Launcher versions. Please see new Answer I have posted here.
Cheers!