Merge "Return Job in collectLatestWithLifecycle" into 24D1-dev