Merge branch '4.9'

diff --cc src/dolphinmainwindow.cpp
Simple merge

diff --cc src/kitemviews/kitemlistcontroller.cpp
Simple merge

diff --cc src/kitemviews/kitemlistview.cpp
Simple merge

diff --cc src/views/dolphinview.cpp
Simple merge