Merge "Fix legacy role holder resolution for assistant, dialer and SMS." into qt-qpr1-dev