(cherry picked from commit 9ab29f5b7fbe15f75477a369e3448194c7e884dc) # Conflicts: # app/build.gradle.kts
(cherry picked from commit 10bf430ce6548eb98502e3084d52af80a917f0f2)