Update theme picker option colors
am: 692dc78c5c

Change-Id: I7d9c8d2ef86f8df55774582caec2f5b060adde69