Email: Allow theming via theme chooser

Change-Id: I8ca369e7fab1d17dc4053f981a6031ebd635ae4e
UnifedEmail - Fix NPE in saveNotificationMap

Fixes an occasional NPE in NotificationMap when dismissing
a notification and value does not exist.

Change-Id: I9930826db421974d5224068f78d9ef1f7c1a7b2c
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	res/layout-sw600dp/wait_for_manual_sync.xml
	res/layout/compose.xml
	res/layout/conversation_list_footer_view.xml
	res/layout/conversation_message_attachment_tile.xml
	res/layout/conversation_view_header.xml
	res/layout/eml_viewer_activity.xml
	res/layout/wait_default.xml
	res/layout/wait_for_manual_sync.xml
	res/layout/wait_for_sync.xml
	res/layout/widget.xml
	res/layout/widget_conversation_list_item.xml
	res/layout/widget_loading.xml
	res/values/colors.xml

Change-Id: I4631b5fb3da489d829091359d5444273d42abacf