Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1