Merge "Dismiss low battery warning on toggling saver." into pi-dev
am: 223074533a

Change-Id: Iee5a691744504cab069502a012efa7baec310161