Merge "Fix BatterySaverStateMachineTest." into qt-dev