QAART-298 fix for customize toolbar tests
Merge branch 'preview'
Merge branch 'master' into dev