Merge "Fix app crash while running in second display" into qt-dev