Merge "Don't show low battery notification if bat saver" into nyc-dev