Merge "Only kill apps with storage app data isolation enabled" into sc-dev