Merge "Add "dumpsys SurfaceFlinger --dispsync""