Merge "Load auto-revoke preference on initial groups load" into sc-v2-dev