Merge "CDD: Relax CDD for activity switching." into nougat-mr1-dev