Merge "Fix crash with two row toolbar" into qt-qpr1-dev