Merge "Ensure surface control is valid before trying BBQ update" into main

                // it hasn't changed and there is no need to update.

                ret = mBlastBufferQueue.createSurface();

            } else {

                if (mBbqSurfaceControl != null && mBbqSurfaceControl.isValid()) {

                    mBlastBufferQueue.update(mBbqSurfaceControl, width, height, format);

                } else {

                    Log.w(TAG, "Skipping BlastBufferQueue update - invalid surface control");

                }

            }

            return ret;