Cherry-pick upstream fixes for key indicator and battery charge state

Charge state needs utopia-team/upower!1 (merged) to work (but no code dependency)

Merge request reports

Loading