Merge "Fix user setting for dark mode not being applied"