Merge "Fixes timestamp passed to the Assistant" into qt-r1-dev