Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into qt-qpr1-dev