Merge "Fix support for rendering status icons" into pi-dev