Merge "Fixed a bug where notifications could stay expanded" into nyc-mr2-dev am: c1c7d1f938
am: 8b36bbf0ea  -s ours

Change-Id: I8b7cba700a76670ce67ec8e3fe377fd16f7df78d