Merge "Fix up color issues as a result of theme change" into oc-dev
am: 8604ac3af5

Change-Id: Id3ac0f5131c9680d38c9d4b83904a47626785bea