Merge "Fix a bug that ripple might get readded to WM and cause crash." into sc-dev