Merge changes I906f6667,I42421408

* changes:
  Construct ambient view in Notification
  Notification: Refactor template parameter passing