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

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

Change-Id: I0d9f6aaa3a53600776c2cbf0b6338f0788dffd14