Merge "Lower max concurrent notifications from an app" into qt-dev
am: 9c11745528

Change-Id: Ie8371bdc294c6c2c721e3ee5e02ecb002f22d43e