Merge "Fix crash in BatteryStatsValidationTest#testGpsUpdates device side" into qt-dev