Merge "Remove divider after last items" into rvc-dev