Merge "Fix people header placement when only hub visible" into rvc-dev