Merge "Fix NullPointerException in PhantomProcessList due to race condition" into sc-dev