Merge "Transferring display name logic to GAL provider" into honeycomb