Merge "Per-display WM brightness override." into main