Minor demo improvements.

Minor demo improvements.

*The primitive shapes demo has had the buttons scaled down slightly to fit on two lines.
*The text editor demo has had a label added to the color change button, which has itself received a border to highlight the less-visible colours.

Change-Id: I16a69bd381ef0c8c980c0c3681cc47117b2d2786