Merge "Manual brightness working as expected with refactoring flag enabled" into main