Merge "Revert "Moving hardware layer to the parent of brightness slider"" into main