Merge "Map Client use content provider for messages"