Merge "Fixed a bug where notifications could overlap" into nyc-dev am: 33e2fc481c
am: 53405ffa62

* commit '53405ffa62ce6a448aed5ee5b3e6d7a261a972b1':
  Fixed a bug where notifications could overlap

Change-Id: I0e2744f0a32811dbc46c9aee6d5eff2011d24905