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

    <Button

        android:id="@+id/state_on_button"

        style="@style/ActionPrimaryButton"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:paddingEnd="8dp" />

        android:layout_gravity="center" />

    <Button

        android:id="@+id/state_off_button"

        style="@style/ActionSecondaryButton"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:paddingEnd="8dp" />

        android:layout_gravity="center" />

</LinearLayout>

 No newline at end of file