Merge "Revert "Implement a global maximum on number of shortcuts an app can publish"" into tm-dev