Merge "Remove hardcode color for battery_detail"