Merge "Revert "Support PER_DISPLAY_BRIGHTNESS."" into main