Merge "Merge "Fix ResolverActivity don't show items" am: e251bb72ed am: 7fd3a8d08b am: 0a0a49a022"