Merge "Insufficient ProcessRecord cleanup when persistent process is killed"