Merge "Prevent showing voice session when it is already queued to be hidden." into oc-dev