Merge changes Iaeb8d9c2,Ifa83ce1d

* changes:
  Fix notification sorting.
  Remove all caps style