Add support for splitting notifications into alert & message

Change-Id: I8eeeeb9a7a1539a258bc42584274897f9e7dc775
Merge "Add support for splitting notifications into alert & message"