Merge "Save whitelist status of all apps." into nyc-dev