Merge "Properly collapse QQS header when QQS is disabled" into rvc-dev