Merge "Improve ResolverActivity UX on TV"