Merge "Don't create a giant layer for all notifications Bug #6642475" into jb-dev