Merge changes Ib03aafe9,Ia51a6db6

* changes:
  Abstract content binding into an interface
  Move control logic out of NotificationContentInflater