Merge "Revert^2 "Support PER_DISPLAY_BRIGHTNESS."" into main