Merge "Fix java SurfaceControl BBQ wrapper update path" into sc-dev