Add new enums for CSS display.

Change-Id: I07d8c88c661a544e5d960e44f17ef218ae299092
CLEANUP: Removes some unused variables.

Change-Id: I7fa9b37be79edc6f5ea0b0d84b4c11160d794ec8
Merge remote-tracking branch 'upstream/master'