Merge pull request #1756 from JosJuice/eslaunch-regression Fix 4.0-4724 ES_Launch and System Menu regressions
