Merge "Support root Uris for EXTRA_INITIAL_URI"