Merge "Resolve trust agents on USER_STARTED in addition to USER_ADDED." into qt-qpr1-dev