Merge "Revert "wcnss: Wait for WCNSS to finish it's error fatal routines during SSR""