Merge "Reinflate settings button on dark mode change"