Merge "Revert "Wait for the previous app process died before restarting it""