Merge "Save internal state to disk after updating whitelist revoked uids." into pi-dev