Merge "Added throttle when reporting shortcut usage" into tm-dev