Merge "SurfaceFlinger: fix invalid PhysicalDisplayId in onConfigChanged event"