Merge "Fix issue #4869092: ResolverActivity occasionally fails to display"