Merge "Plumb display name into SurfaceFlinger" into jb-mr1-dev