Merge "Use filtering when drawing nine-patches" into pi-dev