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