[gnome-settings-daemon] Non-fast-forward update to branch benzea/fix-upower-device-add

[Benjamin Berg <bberg src gnome org>]

The branch 'benzea/fix-upower-device-add' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  d0168b0... power: Guard against events from the wrong device type

Commits added to the branch:

  086b466... power: Guard against events from the wrong device type