Merge "Also call Intent#fixUris for the intent resolver case" into rvc-dev