Merge \"Use colorSecondary for darker bg color.\" into ub-launcher3-calgary
am: 3da982fbab

Change-Id: Ib39cddca3737790e4aef2d61d818ce5e65929d49