[initial-setup][f23-branch/master][v2][PATCH 0/2] Prevent upgrade deadlock due to IS running in background