Merge "Change battery tip text"