Merge "Prototype making expanded notification states optional again" into main