Merge "Prevent transition to coredomain except for system files and vice versa"