Merge "DO NOT MERGE Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView" into qt-dev