Merge "Improve Toast usage" into qt-r1-dev