Merge proposals dependent on lp://staging/~mmcg069/software-center/cats-for-carousel-activated-apps

1. cats-for-carousel-activated-apps
2. Dependent merge proposals