Merge "Update skia api for querying maxRenderTargetSize"