Merge "Revert "If the phone crash try to clean up the channel which was kept...

Merge "Revert "If the phone crash try to clean up the channel which was kept opened. If that fails then try to reuse the existing channel."" into main