Merge "Refactor brightness stack" into main