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