Fix color picker layout.

Change-Id: I9bdd9cfce4d9fefd59c41fa090ce822e2990f00e