Merge "Fix failing toolbar unit tests" into qt-qpr1-dev