Merge "Update config ordering when entering/leaving pip" into rvc-dev