Fix 4.0-4724 ES_Launch and System Menu regressions