Merge "Handle apps that upgrade to full conversations" into rvc-dev