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

* commit '33e2fc481c05e0f9c956fc81a999a2b704c21564':
  Fixed a bug where notifications could overlap

Change-Id: Iae3ac699b1a1ce5d6cb01cba2465387a0dab702b