Merge "[ActivityManager] Fix race condition in pss collection"