Merge "Fix drawing cache on sw drawing" into nyc-dev