Merge "Remove attention controller" into qt-r1-dev