Merge "Cleaning up notification panel drawables"