Merge "Fix issue where launch transition would never end"