Merge "Update the surface size for tasks when config changes" into rvc-dev