Merge "Fix: ResolverActivity sometimes cannot update the last chosen activity" into nyc-dev