Merge "Use collectAsCallbackWithLifecycle" into main