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