Merge "Disable conversation strip" into rvc-dev