Merge "Update attention config" into qt-r1-dev