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