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