Merge "Fix ResolverActivity don't show items"
am: e251bb72ed

Change-Id: Id4877102db82616c5ad1c6e929721fbddb92b129