Merge "Allow special access to priv-app directories"