Merge "Only add divider when it need to show" into rvc-dev am: 8acb04e235

Change-Id: I8f1ea1a38aecfee8856f5f872a16e0478ed411b1