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

Change-Id: I58bf2fdd1b1b89d8b9b7b86110836ee1f6c56ffa