Merge "Introduce a Setting for auto revoke teamfood settings" into rvc-dev