Merge "[Fix settings] Multi user for settings wrapper" into tm-dev