Merge "surfaceflinger: Remove unnecessary std::move" into main