Merge "Add Consumer name in Surface::dequeueBuffer trace"