Merge "Callback the surface package after the views are drawn locally" into rvc-dev