Merge "Only resolve users on content:// Uris." into pi-dev