Merge "Removing the Worskapce as a dependency of CellLayout" into main