Merge "Fixes layout of icons in notification header."