Merge "Fix "auto battery saver" confirmation dialog button layout" into pi-dev