Merge "DO NOT MERGE Make "Want to start battery saver?" dialog better." into pi-dev
am: 6f79bd0019

Change-Id: I452931c53e1ed5b86b8389f120b9ebb3b4059ca3