Merge "Ignore activity lifecycle requests without matching client records." into pi-dev