Merge "Fix launching logic."