Merge "Fixed a bug where notifications could stay expanded"