Merge "Inline settings color changes."