Merge changes from topic "am-832d01d3cd424691910400d0c94d526d" into qt-qpr1-dev

* changes:
  Merge "RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply" into qt-dev am: aced288d66 am: 62a0566244
  RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply am: 34e380cdd6 am: bccb8bec0a