[MERGE] Fix another patch that is not needed anymore regarding deadlock with hide busy indictator