More switching from Activity-based to Task-based control. Change-Id: Ida47d71a52b875a6a6bd77cb62911053f942da15