Merge "Pre-grant permissions split from install permissions"