Merge "Update auto-revoke toggle UI w/ hibernation" into sc-dev