Theming fixes.

Make Toolbar primary text white, and give compose FAB a meaningful
elevation.

Change-Id: Icce5ca70e1196ab511e3426451b1edd1c4c59680
Merge branch 'cm' into HEAD