Merge "Fixes NotificationHeaderView layout."