Merge "Flatten notification hiearchy and remove glow."