core: fix/cleanup for CAF ActivityTrigger+Performance

Change-Id: I97a954010d2667bcf9b6586e47734c3762521f77