Merge \"Consolidate all the dividers to provide same look and feel\" into ub-launcher3-calgary
am: c9b6d84328

Change-Id: Ib216fb34f0019b0b73151f0dc5e50d188f0c0936