Merge "Map SurfaceFlinger display mode ids to Display.Mode ids" into tm-dev