Merge "Fix issue #9860494: Waiting for service batteryinfo..."