T4T migration to Jetpack Compose