Merge branch '1.2.1' into 1.2.0_google

wjc

2025-05-23 971a24a9e58a21bc306897fd3ad63012a399f7db

 .gitignore

@@ -52,3 +52,4 @@
.idea/workspace.xml
.idea/
*.properties
local.properties