Better limits on number of notifications in the flyout

Change-Id: Ic53f6ebe530a73ef89204a96b22194a17d034a12
Merge "Better limits on number of notifications in the flyout"