Merge "Use WRAP_CONTENT for battery saver button" into pi-dev