Merge "Update BatteryUtils to update system battery estimate cache" into qt-dev