[gnome-settings-daemon] Non-fast-forward update to branch wip/carlosg/remove-device-mapper

[Carlos Garnacho <carlosg src gnome org>]

The branch 'wip/carlosg/remove-device-mapper' 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:

  4a7bea0... wacom: Migrate 'display' setting to 'output' for opaque tab

Commits added to the branch:

  5e6ede6... wacom: Migrate 'display' setting to 'output' for opaque tab