Merge "Fix NPE when ripples are canceled due to visibility change" into lmp-preview-dev