Merge \"Update Launcher to use theme colors.\" into ub-launcher3-calgary
am: 61edb5422b

Change-Id: I1d35ff85626f1c7b3bd3644b9b5f5fb582d25e6a