Merge "Add Auto Revoke Enabled settings constant"