Merge "Organize notification classes in row/stack"