(cherry picked from commit 782c44bc)

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

(cherry picked from commit f5dc5f0e)

(cherry picked from commit 0def61dc)

Enforce that no interactive events are stolen by scroll view because
those are handled as graph operations already.

(cherry picked from commit a3b68b65)

GIT_SILENT

(cherry picked from commit 05e0c46e)