Merge changes Ifa55ca19,I7c05b19a

* changes:
  Move a bunch of row setters into an init method.
  Convert NotificationContentInflater to singleton