Merge "CDD: Reduce the required number of activities in the recents" into oc-mr1-dev am: 8ad7b0ba00  -s ours
am: 4e9e5ad65c  -s ours

Change-Id: Id92156e0215f0b2b02c385dcbbfde8f7aba7983a