Merge "Fixes to granting URI permissions - take into account path perms." into gingerbread