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

* commit '53405ffa62ce6a448aed5ee5b3e6d7a261a972b1':

Change-Id: I71307bcc23a47ba9c5c0d3e0b2a80ba71dacd33b