Merge "IconFactory should be initialized before mAdapter is created inside ResolverActivity"