Merge "Fix color option changes while applying dark/light theme" into tm-dev