Merge "Night Mode Indicator" into main