Merge "Fix for testPaintFlagsDrawFilter CTS test" into jb-mr1-dev