RC: fix color picker in landscape

*Also adjust margins for "default" text. This probably isn't
 necessary, but it matches value in portrait view now and is
 just future proofing the possibility of the text being dropped
 to two lines on devices with smaller screens. This has no
 affect what-so-ever on the view of current devices.

Change-Id: I3525243cc0f1ce644a6285d7bbfe8dfe1c665e25
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
Merge "RC: fix color picker in landscape" into kitkat