Merge "Don't allow acccess to uninstalled system providers" into pi-dev