Merge "ResolverActivity: Rename alwaysCheck to always."