Merge "Remove "force user set on upgrade" setting" into tm-dev