Merge "Revert "Revert "Handle kernel launch calls"""