Merge "DO NOT MERGE Don't lock listener delivery" into rvc-dev