Merge "Merge "Implement a global maximum on number of shortcuts an app can publish" into tm-dev am: 118fcda1c0 am: cb312928fb"