Merge "System Alerts show follow dark theme"