Merge "Write top focused display ID in WindowManagerServiceDumpProto."