Merge "Replaces unnecessary collectLatest with collect" into main