Import patch merged upstream. Fixes an issue which causes processes to not being removed from list sometimes. PR: 247960 Submitted by: rozhuk.im@gmail.com MFH: 2020Q3