Merge "Prevent any SecurityExceptions on Uri resolution" into sc-dev