Merge "Fix bug where process whitelist manager state would not be correct." into nyc-dev