Merge "Reload color sysprops after failing" into tm-dev