Merge "Fix ephemeral post-install launching"