Merge "Limit the number of shortcuts per app that can be retained by system" into tm-dev