widget: Make sure to always set the style

https://bugzilla.gnome.org/show_bug.cgi?id=727614
(cherry picked from commit 7a8256af09173496a09afec90249a9875c742896)

Conflicts:
	src/vte.c
widget: Set the ring's in-memory size on terminal reset

(cherry picked from commit 2249f514c877041dd291a717360cd6e2747103f5)

Conflicts:
	src/vte.c
widget: Fix a rare display update problem after a terminal reset

https://bugzilla.gnome.org/show_bug.cgi?id=730599
(cherry picked from commit 8fbb9722099fa4af01cfb16919fe61282a7aa9ab)
widget: Speed up scrolling in very large terminals

https://bugzilla.gnome.org/show_bug.cgi?id=730732
(cherry picked from commit b8db6a28b9b809a643268941a3bd1b0dcff70198)
iconv: Fix broken _vte_conv_utf8_strlen

(cherry picked from commit 3287a66f02edd3f26e5da708d1c3d36b3418a23c)
iconv: Fix a broken unittest

(cherry picked from commit 8a17c8ee4474b84414e5ed35a604ff3abfbe3fbe)
iconv: Fix the UTF-8 decoder when a NUL byte is encountered

https://bugzilla.gnome.org/show_bug.cgi?id=730220
(cherry picked from commit 95879ab9b4aa113d7877e4d080fbb7b403963f3b)
emulation: Keep the incoming buffer on reset

https://bugzilla.gnome.org/show_bug.cgi?id=730760
(cherry picked from commit 9240ed8a65549300840aa15fc1580f6c350ae583)

Conflicts:
	src/vte.c