am 150ab3ed: am d3ef7ac5: (-s ours) Merge "NotificationShowcase improvements"

* commit '150ab3ed41ef27667a4748767fde91d4da8c04c9':
  NotificationShowcase improvements