Merge "Move cell layout tests to deviceless tests" into main