Merge "Adding single user layout for ResolverActivity" into main