Merge "[pm] fix acquireAndRegisterNewAppId after app removal" into tm-dev