Merge "Implement auto revoke user whitelist intent handler" into rvc-dev