Merge "Do not kill split permission apps on permission grants" into sc-dev