Merge "SurfaceView: Release BBQ where we release Surface" into sc-dev