Merge "Add missing @deprecated comments to canvas methods"