Merge "gltrace: fixup Push & Insert Marker calls"