Add a few layout color redirections for Theme Chooser

Change-Id: I5defdb7cad2e2948f197580a0560d38e3e0b479e
Merge branch 'cm-10.2' into martincz