Merge "Fix incorrect launcher loading."