Merge "Move flattened APEX activation logic to apexd."