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

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

Change-Id: Ib93924d2c6828bca840a4529531f64a6278b4af0