Merge "Remove odd spacing after the divider" into qt-dev