Merge "Merge "Fixed a bug where Notifications could overlap" into nyc-dev am:...
Merge "Merge "Fixed a bug where Notifications could overlap" into nyc-dev am: fa2dc635 am: 210b14d8" into nyc-mr1-dev-plus-aosp
am: 9702da4f
* commit '9702da4f':
Change-Id: I1fb70230236f3ea525f3f893028367bd50c31c01