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

* commit 'c59734d819bb32e7d570552d3621a7b803489a28':
  Fixed a bug where notifications could overlap

Change-Id: Ibb58eda6117d3c5cf3e4c9a98843fc9d2a47cf57