Launcher profile fixes

This fixes the profile management regressions. Might want to cherry-pick into the release branch.