Merge "Resolve ringtone Uris using Context user." into nyc-dev