Merge "Don't filter demoted conversation from app subtext" into rvc-dev