Closes #9358 (cherry picked from commit e23cc8f83ad00ad45b709a40b7c3ca90a86477f1) # Conflicts: # app/build.gradle.kts