Merge "Change batteryTip text"