Merge "[Fgs Manager] Increase contrast between text and background" into tm-dev