Merge "Reset draw modifiers after flushing" into jb-mr2-dev