Merge "detect all masks, and don't use masksuperblitter with those." into jb-dev