Merge "Only clear SurfaceControl.Transaction when parcelling as a return value" into sc-dev