Merge "Re-enable BatteryMeterView checking the icon_blacklist"