Merge "Battery: report calculated power, tweak signal strength colors."