Merge "Merge "Only add divider when it need to show" into rvc-dev am: a73d6ecb84 am: 82a8ca187c" into rvc-d1-dev-plus-aosp