Merge "Revert "Remove attention controller"" into qt-qpr1-dev