Merge "Remove deprecated android.graphics.Canvas APIs" into pi-dev