Merge "Revert "Revert "Revert "Moving hardware layer to the parent of b..."" into main