Merge "Fixes bad merge in Assistant Handle logic" into qt-dev