Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev