Merge "Transferring directory display name logic to directory providers" into honeycomb