Fixes #10187 (cherry picked from commit ccadfc8fe53ff1b8ab66b0e91a4fa5a21481bcda) # Conflicts: # app/build.gradle.kts