Merge "Workaround issue of getting 0,0,0,0 inval rects"