Merge "Limit the number of Notif Channels per app" into qt-qpr1-dev