Merge "[automerger skipped] Merge "Added throttle when reporting shortcut usage" into tm-dev am: b170427ab8 am: 3365b56c7b am: 4bb66ea3d0 -s ours am: 9fc1b6f390 -s ours am: 9b9d38b635 -s ours" into main