Merge "Fix DrawFilter's usage in HWUI."