Fix problem with empty content disposition

* And while we're at it, fix a repeating crash related to
  notifications.

Bug: 6561972
Change-Id: I44f2441bf7bfe4b364a605c0d7c8bae83229837a
2 files changed