Merge "Ensure hibernation exemption toggle uses pre-S flag" into sc-dev