Merge "Revert "Change battery tip text""