Merge "Do not strip colorspace attribute for RGB888 surfaces." into pi-dev