Merge "Fix FILTER_BITMAP_FLAG regression in DrawFilter."