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

Change-Id: I9b71c825c26d5fb3724508eee642635298449e24