Merge "Update assist handle behavior control" into qt-dev