Added bundleId for simulator build and did a cleanup for isSafariLauncherApp flag