Merge "Make shared ManageWindowsViewContainer more generic" into main