Merge "Stop using deprecated Canvas APIs." into ub-launcher3-master