Merge "Merge "Fixed a bug where notifications could overlap" into nyc-dev am: 33e2fc481c am: 53405ffa62" into nyc-mr1-dev-plus-aosp