Merge "Clean up forked collectAsStateWithLifecycle"