Merge "Fix incorrect PackageSetting in the SharedUserSetting" into tm-dev