build: Resolve git merge conflict
app: Fix window size when a second tab is added by drag-n-drop

https://bugzilla.gnome.org/show_bug.cgi?id=730850
(cherry picked from commit d3e593e4974303618305da4e0d20f0d5c10f83b0)