Merge "Fix flicker in Dark theme" into tm-dev