Merge "ResolverActivity: make it theme friendly and support dark theme"