Merge "Use view::Surface instead of IGBPs in OutputConfiguration" into main