Merge "Update listener instead of creating a new one" into rvc-qpr-dev