Merge "Move two params to ResolverActivity.onCreate()" into udc-qpr-dev