Merge "Fix launcher crash, bug: 3368489"