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