Merge "Delete expired CE APEX snapshots when user unlocks." into rvc-dev