Revert "Only add divider when it need to show"

This reverts commit 91bba497c314e4d717a94ea72c928a76a192b332.

Reason for revert: unblock wm presubmit

Fix: 157629296

Change-Id: I04fd8b79de025d7c531ac03218a7590e6a32e1be
3 files changed