Merge "Use BatteryMeterDrawableBase as QS icon for Battery Saver" into oc-dr1-dev