Merge "Save brightness changes when mode switched to manual" into main