Merge "Don't show low battery tip when estimation is zero"