Merge "Set FLAG_HARDWARE_ACCELERATED for ResolverActivity" into main