drawstack: Added some asserts and actually tested/fixed merge now