Merge "Fail startup via ResolverActivity.super_onCreate()" into tm-qpr-dev