Merge "Hide header if no items present" into rvc-dev