Merge "Cap the size of app-defined permission trees"