Merge "Merge "Properly collapse QQS header when QQS is disabled" into rvc-dev am: 7566f6d3 am: 82b42fca" into rvc-d1-dev-plus-aosp