Merge "DO NOT MERGE: Update toolbar to be the same as on master" into qt-qpr1-dev