Merge "Only add divider when it need to show" into rvc-dev