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 branch "cm-11.0" into kylin